Clean up xenbus code not to use priorities.

Signed-off-by: Rusty Russel <rusty@rustcorp.com.au>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
index 118069237b5ecfbc4dcb43cb631ebd4e480d9bd1..6b5735d809a361c18cb95e36749b0871ea88b64f 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
@@ -409,18 +409,14 @@ int xenbus_gather(const char *dir, ...)
        return ret;
 }
 
-static int xs_watch(const char *path, const char *token, unsigned int priority)
+static int xs_watch(const char *path, const char *token)
 {
-       char prio[32];
-       struct kvec iov[3];
+       struct kvec iov[2];
 
-       sprintf(prio, "%u", priority);
        iov[0].iov_base = (void *)path;
        iov[0].iov_len = strlen(path) + 1;
        iov[1].iov_base = (void *)token;
        iov[1].iov_len = strlen(token) + 1;
-       iov[2].iov_base = prio;
-       iov[2].iov_len = strlen(prio) + 1;
 
        return xs_error(xs_talkv(XS_WATCH, iov, ARRAY_SIZE(iov), NULL));
 }
@@ -479,7 +475,7 @@ int register_xenbus_watch(struct xenbus_watch *watch)
        sprintf(token, "%lX", (long)watch);
        BUG_ON(find_watch(token));
 
-       err = xs_watch(watch->node, token, watch->priority);
+       err = xs_watch(watch->node, token);
        if (!err)
                list_add(&watch->list, &watches);
        return err;

diff --git a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h
index 6d36ee7b86349e64e8f369ad62c38dc255dcd0a6..f0dfa83d9c3c3c6eb38552d1ffe7cc099f31915b 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h
@@ -109,7 +109,6 @@ struct xenbus_watch
 {
        struct list_head list;
        char *node;
-       unsigned int priority;
        void (*callback)(struct xenbus_watch *, const char *node);
 };